Skip to content

fix: restore resume session metadata for resumed actions#580

Merged
matt2e merged 2 commits intomainfrom
resume-cause-spinner
Apr 2, 2026
Merged

fix: restore resume session metadata for resumed actions#580
matt2e merged 2 commits intomainfrom
resume-cause-spinner

Conversation

@matt2e
Copy link
Copy Markdown
Contributor

@matt2e matt2e commented Apr 2, 2026

Summary

  • restore branch and project metadata when resuming commit, note, and review sessions
  • infer push and pull request session types for resumed branch actions
  • add coverage for resume session type inference

@matt2e matt2e requested review from baxen and wesbillman as code owners April 2, 2026 05:42
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5cc1e8a5ce

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment on lines +230 to +233
} else if let Some(note) = &linked_note {
store.get_branch(&note.branch_id).ok().flatten()
} else if let Some(review) = &linked_review {
store.get_branch(&review.branch_id).ok().flatten()
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Preserve remote repo path when inferring linked note/review branch

Falling back to linked_note/linked_review here sets linked_branch (and later workspace_name) even when branch_id was not passed to resume_session, but remote_working_dir is still only resolved from branch_from_id later in this function. In the Session Launcher flow (SessionModal opened without a branchId), resuming a remote note/review session will therefore run via workspace ACP with no repo path override, so commands execute in the workspace default directory instead of the branch repo/subpath. This can make resumed actions fail or operate on the wrong repo for multi-repo/subpath workspaces.

Useful? React with 👍 / 👎.

@matt2e matt2e merged commit 764da2a into main Apr 2, 2026
4 checks passed
@matt2e matt2e deleted the resume-cause-spinner branch April 2, 2026 05:52
loganj added a commit that referenced this pull request Apr 9, 2026
…ktree-dis

* origin/main: (45 commits)
  feat(penpal): persist recent files activity across restarts (#595)
  feat: persist open windows, tabs, and geometry across app restarts (#588)
  feat(staged): generate next prefill text when generating notes (#594)
  feat(staged): add "Run again" button to action output dialog (#593)
  feat: queue repo sessions in project MCP with async cancellation fix (#591)
  fix(staged): lowercase "building" subtitle for consistency (#592)
  fix(staged): use completedAt for commit prefill timeline ranking (#590)
  fix: add per-branch mutex to prevent worktree setup race condition (#589)
  feat: add diff commit session launcher (#585)
  fix: avoid error state for empty titled code reviews (#587)
  fix: cancel in-flight auto reviews before manual sessions (#584)
  feat(settings): add repo context search (#583)
  fix(staged): sort timeline items by completion time so queued items appear before completed ones (#568)
  fix: drain queued branch sessions from backend lifecycle (#579)
  fix: restore resume session metadata for resumed actions (#580)
  feat(staged): add purple diff comment theme (#578)
  fix(ui): hide branch actions during setup (#572)
  fix: validate parsed PR URLs before extraction (#577)
  fix: centralize staged relative time updates (#576)
  fix: avoid UI freezes when starting background sessions (#575)
  ...

# Conflicts:
#	apps/penpal/internal/watcher/watcher.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant